Text node bug fix
Merge branch 'tmp' into 7.x-1.x