squash w/ prev
squash with locallib updates
squash with tinymce plugin update
update to tinymce plugin