Merge to llvm3.3 version of date 20130322