conservative gem update
Merge pull request #3 from iseatz/gemlock

*** Part of Gem update project ***