Update to Master
Merge branch 'master' into b.1.0