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