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