Merge branch 'MDL-45339-master' of git://github.com/xow/moodle