Elgg/Elgg — pull request #6145 by Srokap (2013-10-18 01:01:46+00:00)
Title: Pr/6136 test

This fixes #6143, adds tests for #6136 and rebases original PR on top of it.