R1:be544e02982e

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

Conflicts:
src/__celerity_resource_map__.php