Oops, revert merge master into 1.0