Merge "chg: hide "Show advanced options" checkbox when javascript is disabled"