Merge "CleanSpec for clang 3.5"