Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev