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