am 253290a7: merge from open-source master

Merge commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b' into kraken

* commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b':
  Removed bad BuildPaths (not existing Directories after checkout)