Upgrading to 1.0-b21