Merge branch 'bug-15852-u3-tests_platformproject_scalartype_float_to_double' into bug-15852-u11-platformproject_scalartype_float_to_double
Conflicts:
Core/Code/Testing/mitkDICOMLocaleTest.cpp
Modules/ImageStatistics/Testing/mitkPointSetStatisticsCalculatorTest.cpp