Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle