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