Updated version to 2.7
Merge branch 'release/2.7' into develop