update gemfile.lock
Merge branch 'master' into state-local