Merge branch 'MDL-46618_master' of git://github.com/kordan/moodle