Update gems
Merge branch 'master' into qa