Merged wysiwyg-wicket (from andunslg)