fix #6052
Merge branch 'master' of https://github.com/JuliaLang/julia