Merge pull request #1104 from laanwj/2012_04_clang