Fix variable initialization order
Squashed 'core/' changes from 635d7bf..a638835

a638835 Add display debugging
e3d5129 Merge commit '93ec472247fda249755c004bfafda5655e026bc9' as 'wysiwyg'
93ec472 Squashed 'wysiwyg/' content from commit bd98a03

git-subtree-dir: core
git-subtree-split: a638835e563adf069302f591d669537ae2022aa4
Merge commit '4507051c574abc9f89deedae5463581110ef2acc'