Gems updated
Merge branch 'master' into oxon