Merge branch 'hotfix/0.2.6'
Merge branch 'develop'
Merge branch 'develop'
Ready for new deploy
Merge branch 'master' into develop