Merge branch 'MDL-26513_restrict_modules' of git://github.com/stronk7/moodle