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