add some missing type parameters revealed by my new upcoming warning
fix a type intersection bug, probably a somewhat recent regression
plus test
Merge branch 'master' of github.com:JuliaLang/julia