Overwrite tags in TE edit only if user is not editing them (osx)
Merge branch 'master' into builds
7.419