Merge branch '2.0b4'
Merge branch 'master' into 2.0b4