Version bump to 2.0.7
Merge branch 'release-2.0.7' into develop