Minimize unneeded differences between Jumbo and core.
Wordlist fixes.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Wordlist fixes.
  Minimize unneeded differences between Jumbo and core.