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
CheckTypeSize: Unset temporary variables when done (#14690)

When the macro is invoked multiple times, the parsing variables were
not unset and therefore used for all the following calls.
Merge topic 'CheckTypeSize_fix_multiple_invocation' into next

8252406 CheckTypeSize: Unset temporary variables when done (#14690)
Merge topic 'CheckTypeSize_fix_multiple_invocation'

8252406 CheckTypeSize: Unset temporary variables when done (#14690)
Merge topic 'find-java-os-x-fixes'

519084c FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)
Merge topic 'minor-cleanups'

e7a111f InterfaceLibrary: Add test requiring MAP_IMPORTED_CONFIG whitelisting
Merge topic 'remove-duplicate-file'

fcd5531 Tests: Remove .orig file.
Merge branch 'master' into next
Insert CMakeCache.txt in implicitDeps before sorting.
Merge topic 'ninja_fix_rerun' into next

be239ea Insert CMakeCache.txt in implicitDeps before sorting.
Allow LOCATION property at configure time only on IMPORTED targets.
Don't allow include() of the result of export().
Add more cmGeneratorTarget API to cmGlobalGenerator.
Move GetLocation to cmGeneratorTarget.
Move GetFullPath to cmGeneratorTarget
Port cmExportBuildFileGenerator to cmGeneratorTarget.