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