Merge branch 'master' into 2.9.x
Fix the jquery-ui url to work with both http and https
Merge branch 'jquery-ui-url' into 2.9.x
Version 2.9.4
Merge branch '2.9.x'