Merge branch 'master' into nonophp

No match.