Fix conflict with the now native Form and HTML classes
Merge branch 'agnostic'