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