Prevent race conditions in reloading nodes, closes #1009
Merge pull request #1012 from jnicklas/reload-race-conditions

Prevent race conditions in reloading nodes, closes #1009