Fix issue #2082
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop