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