Merge branch 'master' of git://github.com/tsabi/dokuwiki into pull-request-2620