Merge branch 'w51_MDL-36893_m23_mnetestrict' of git://github.com/skodak/moodle into...