Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle