Merge branch 'MDL-74221-master-form-buttons-revert' of https://github.com/snake/moodle