Updated to match the latest git version.