Ported v3.1 unlinked headings in mega menus support.
Added JSHint scripturl tolerance to pe-ap.js.
Resolved merge conflict.