Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle