merge changes from development to the tinmce3 plugin