Merge 0.4.0pre of wysihtml5 js