Nodeblock enabled for Article, default off
Merge remote-tracking branch 'origin/develop' into release

Conflicts:
	patches/readme.md