updated gemset
Merge branch 'master' into stable