Merge "Minimal support for Clang" into release-4-5-patches