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

Authored by ronaldv on Nov 13 2019, 10:23 AM.