R1:7ec8e885e1a7

Merge branch 'master' into phutil_tag

(Final final sync.)