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