fix for issue 2036
Merge branch 'development' of https://github.com/societies/SOCIETIES-Platform into development