fix bug on iterating thru node attributes
Merge branch 'master' into 1