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