Fixing bin/gem_template error
Merge branch 'master' into release