Merge branch 'MDL-30157_master' of git://github.com/dmonllao/moodle