Merge branch 'MDL-70106-icon-cache' of https://github.com/Peterburnett/moodle