Merge branch 'MDL-28436' of git://github.com/nebgor/moodle