Merge branch 'master' of http://anongit.kde.org/wikitolearn-frontend

Authored by dcarrara on Jun 7 2018, 8:46 AM.