v.2.1.3-beta1
Merge branch 'master' into MOODLE_26

Conflicts:
	tests/other/backup-test-course-for-moodle2.2.mbz