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