Fix Bug#1180494 "Concurrent CMake build does not work properly"
Merge branch 'stable'