Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle