make finally work with return. fixes #1784
Merge branch 'master' of github.com:JuliaLang/julia