Merge branch 'release-1' into develop
less nokogiri time
bumped
Merge branch 'release-1.1'