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