Merge branch 'develop'
Merge branch 'release/1.6.12'
[#492] Release Notes v1.6.13
[#492] Fix typo in release notes
Merge branch 'release/1.6.13'
Merge branch 'master' into develop