Merge branch 'w36_MDL-29351_m22_tempregr' of git://github.com/skodak/moodle