Merge branches 'bachibouzouk' and 'anacoluthe' of https://github.com/mrflos/yeswiki into bachibouzouk