Merge branch 'hotfix/1.7.7'
Explicitly adding nokogiri
Merge branch 'hotfix/1.7.8' into develop