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