Merge branch 'master' of https://github.com/lupo49/dokuwiki into lupo49-master