Merge branch 'master' into v1.6
Merge branch 'v1.6'