Fix test failure in JFormFieldUrlTest
Merge branch 'staging' into 3.3-dev