updated block config
Merge remote-tracking branch 'origin/master' into block-bundle

Conflicts:
	reference/configuration/block.rst