Nokogiri 1.6
Merge fix