Merge branch 'MDL-69910-calendar-protectusername' of https://github.com/brendanheywoo...