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