Merge branch 'release/v0.2.15'
removed stray end
Merge branch 'hotfix/v0.2.15.1' into develop