R1:61de3990e9da

Merge branch 'master' of git://github.com/facebook/phabricator into ircconfig