Updated gems
Merge branch 'master' into import-export