Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle