R1:f9030885c414

Merge branch 'master' into phutil_tag

(Just synchronizing master into the tag branch.)