Merge branch 'MDL-28684b' of git://github.com/bostelm/moodle