Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle