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