Merge branch '42628-26' of git://github.com/samhemelryk/moodle
Merge branch '40975-26-r1' of git://github.com/samhemelryk/moodle
MDL-42740 theme_anomaly: fixed block editing actions.