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