Version 2.7
Changelog
Merge branch 'master' into develop