Merge branch 'vs9-map-Fd' into release
Merge branch 'xcode-5.1' into release
Merge branch 'fix-compile-OBJECT_DIR' into release
Merge branch 'xcode-storyboard-file-type-2.8.12' into release
Merge branch 'vs10-include-backslashes' into release
Merge branch 'ninja_fix_rerun' into release
CMake 2.8.12.2
Merge branch 'release' into test-release
Merge topic 'test-release' into next

a82c1441 Merge branch 'release' into test-release
a921557a CMake 2.8.12.2
af3ead2c Merge branch 'ninja_fix_rerun' into release
6d004976 Merge branch 'vs10-include-backslashes' into release
67fd61b0 Merge branch 'xcode-storyboard-file-type-2.8.12' into release
5e345883 Merge branch 'fix-compile-OBJECT_DIR' into release
1ab31dc2 Merge branch 'xcode-5.1' into release
3401c72c Merge branch 'vs9-map-Fd' into release