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