Merge "Remove hideous warnings with clang-based builds." into idea133