Explicitly adding nokogiri
Merge branch 'hotfix/1.7.8'