Switch to new version for specifying gemset
Merge branch 'master' into develop