Elgg/Elgg — pull request #6380 by Srokap (2014-01-31 15:50:28+00:00)
Title: Pr/6331

Replaces #6331