Merge "Fix linkification of URLs containing ampersands"