Fix gemspec
Merge branch 'master' into lazy-defaults