Update from master following 1.0.0.RC2