Merge remote-tracking branch 'origin/quick-entry'
Updated gems
Updated gems
Remove rake --trace option because it's gone in 10.4.0
Updated gems
Merge branch 'master' into quick-entry