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