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