R1:8f1311bbc182

Merge branch 'master' into phutil_tag

(Final sync.)