Merge branch 'MDL-51586-master' of git://github.com/xow/moodle