Fix last commit (update Gemfile.lock)
Merge branch 'master' into develop