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