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