branch base for v1.0.0 & v1.0.1; r=shipit a=joduinn DONTBUILD