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