Refs #3929 Forum; Merge with trunk

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/Naaya@21117 a0171fae-0946-0410-966d-b1775066cd26