Make sure trunk uses the same version number as master.