Merge branch '1.9.x'
Merge branch 'master' into 1.9.x