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