Git merges in Moodle 3.9.5 by Adrian Greeve

commit e539a0aa30a39eb5fcb7f7d7f2f512e180ca0386
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 11 Feb 2021 10:05:29 +0800
Tag:    v3.9.5

Merge branch 'MDL-70513_39' of https://github.com/timhunt/moodle into MOODLE_39_STABLE

commit 7116f5fde8340990a7cfe6f1bc0a66387f4dc807
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 11 Feb 2021 09:25:19 +0800
Tag:    v3.9.5

Merge branch 'MDL-69867-39_display_grade_with_scale' of git://github.com/moffe42/moodle into MOODLE_39_STABLE

commit aa3118999abdcaae1063e4fab80f52f9f6f7abbd
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 21 Jan 2021 12:03:26 +0800
Tag:    v3.9.5

Merge branch 'MDL-57020-39-allow_delete_unused_scale' of https://github.com/sharidas/moodle into MOODLE_39_STABLE