Merge branch 'release-v1.6.1'
Merge branch 'devel'
Merge branch 'master' into devel