Fix <type>3 padding issues
Merge branch 'master' into llvm-trunk