Merge branch 'MDL-61055-master-v2' of git://github.com/lameze/moodle