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