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