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