Merge fix for map rotation, fix version number