Merge branch 'incoming' into merge_clang_401