Merge "Add dev dependency on HTML matchers"