Trying to update the gems
Merge remote-tracking branch 'origin' into becoming-boring