Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle