Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle