Decoupling dependencies
Merge branch 'elgg1.8'