Nokogiri test, and merge of Utter's dev branch.