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