Replacing node_template instance variables
Merge branch 'master' into bookshelf