Merge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle