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'