fix clang+libc++ build break
Merge remote-tracking branch 'upstream/master'