Merge branch '1.9'
Merge branch 'master' into develop