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

Authored by dcarrara on May 22 2018, 12:38 PM.