[GAIA] - reorganization of the DOM handlers
Merge pull request #440 from michalbe/Bug1042584-ICE-2-temp

[GAIA] - reorganization of the DOM handlers