Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle