More minor gem updates
Merge branch 'master' into emoji