A lot more gems. They need testing.
Merge branch 'master' into upgrade-some-gems