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