Merge branch 'release/0.5.15' into develop
:-(
Merge branch 'develop'