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