Fixed #259
Merge branch 'fix/259' into dev

Conflicts:
	src/lib/system/blocktype/ContentBlockType.class.php