Merge branch 'MDL-28248b' of https://github.com/totara/moodle