Merge remote-tracking branch 'origin/master' into hjl/lto/master