fix an flisp bug partially responsible for #2239
Merge branch 'master' of github.com:JuliaLang/julia