LLVM/Clang 3.5
Merge branch 'stage' into media