Merge branch 'MDL-28466-master' of git://github.com/danpoltawski/moodle