Release 2.0.0pr7
Merge branch 'master' into 2.0.x