Incorporated small change from tinymce trunk