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