Merge branch 'w47_MDL-36547_m23_sectiongen' of git://github.com/skodak/moodle into...