Merge Fixes for zim2dokuwiki