Remove tags from TE edit view, will rethink them (osx)
Merge branch 'master' into builds
7.320