Merge branch 'release/0.2.7'
Merge branch 'master' into release/0.2.7b
Merge branch 'release/0.2.7b' into develop