Fix finding the data item for TreeView templates
Merge branch 'master' into gh-pages