ConfigHandler, Reference and GUIFactory Changes.
Merge remote-tracking branch 'origin/master'