defaults are made type-dependent (again)
minor.
tiny.
Merge branch '2_10'
Merge branch 'master' into async