R1:39221b1d3f28

Merge branch 'master' into phutil_tag

(Synchronizing.)