Refs #16938 CHM; merge trunk to branch

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