fix modal window with editor bug
Merge branch 'master' into 2.5