Merge with Phabricator master.