Merge branch 'MDL-67846-master' of git://github.com/lameze/moodle