Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle