Tweak versions to work with an rc
Merge branch '13rc1'