Merge branch 'MDL-28364' of git://github.com/jonof/moodle