Git merges in Moodle 3.2.8 by Andrew Nicols

commit b85d42a3d72b1dae585f65094d62519891beabb9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Feb 2018 17:54:50 +0800
Tag:    v3.2.8

Merge branch 'MDL-61269_32' of git://github.com/stronk7/moodle into MOODLE_32_STABLE

commit 1f82f1fa65557c3f1b1e07e8e8946efb33b697b9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Jan 2018 11:01:17 +0800
Tag:    v3.2.8

Merge branch 'install_32_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_32_STABLE