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