Merge remote-tracking branch 'twitter/master'
Merge branch 'master' into jsirois/sync/pants-1