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