fix for JS error from Wysiwyg plugin in admin login page.
Merge branch '1.5' into 1.5-ui-nav