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