Merge branch 'MDL-55071-rebased' of git://github.com/danpoltawski/moodle