Add support for next watir-classic.
Merge branch 'master' of github.com:watir/watir