Merge update from ..llvm-mirror:master