Merge branch 'master' into 1.0-beta
Merge branch '1.0-beta'
Adding namespace