Clang backports for 4.9 and 4.4