Merge branch 'master' into phpng

No match.