#2533178 - Replaced browser sniffing with feature detection as criteria for continuing HTML5 uploader unit test
Merge branch 'dev-master' into dev-3.x

Merge dev-master into dev-3.x before testing dev-3.x.