corrections 2.6
corrections

Conflicts:
	blocks/activity_modules/tests/behat/block_activity_modules.feature