Merge branch 'hotfix-1.6.15'
Added a description
Bumped version
Merge branch 'hotfix-1.6.16' into develop