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