Moved bad function only used in text nodes to node file.
Merge branch 'development'
Merge branch 'master'