Merge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle