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