3.0.7
More 3.0.7
Merge branch 'master' into development