Handle trimming and removing whitespace from text nodes
Merge branch 'develop' into gh-pages