Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Authored by ronaldv on Mar 13 2019, 8:46 AM.