Merge branch 'release/0.9.4' into develop
moved layout names to layouts module, no redirect nodes to self
bumped version
Merge branch 'release/0.9.5'