3.0 tweaks
Merge branch 'master' into mono-3