Merge branch 'MDL-15377-master' of git://github.com/raymanuk/moodle