Cater for nokogiri >= 1.6
Merge remote-tracking branch 'hooroo/master'