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