Merge branch 'MDL-51564-master' of git://github.com/jleyva/moodle