fix #2982, fix #2983, some issues with macroexpanding type expressions
Merge branch 'master' of github.com:JuliaLang/julia