avoid conflicts between field names and types. fixes #2919
Merge branch 'master' of github.com:JuliaLang/julia