fix more cases like the previous setindex! fix (#7130)
Merge branch 'master' of github.com:JuliaLang/julia