dokuwiki-20131208-binky
merge with DokuWiki 20131208 Binky