Merge branch 'MDL-36914-master' of git://github.com/damyon/moodle