Merge branch 'release-3.1.6'
Merge branch 'master' into develop