Merged `master' to branch http://www.gemfile.lock