Merge branch 'MDL-66851-master' of git://github.com/mihailges/moodle