R1:7f601a78d30e

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