cherry-pick from llvm-3.3, w/ correct version
never gonna like leading commas