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