Git merges in Moodle 3.2.9 by Jake Dallimore

commit 25f79d544becd870d2492124e54d7faf17db4a2f
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 03 May 2018 10:54:22 +0800
Tag:    v3.2.9

Merge branch 'MDL-62280-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE


commit 9ab0ffdeadec4e65c9c00de64515b11e1cba521b
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 28 Mar 2018 13:34:16 +0800
Tag:    v3.2.9

Merge branch 'MDL-61770-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE