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