Merge branch 'MDL-40776_master' of git://github.com/s-cenni/moodle