Upgrade gem dependencies
Merge branch 'master' into remove-query-logging