Git merges in Moodle 3.1.12 by Jake Dallimore

commit 10426ccf9dcf0b216d25d4c7fa50c23293c593bc
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 03 May 2018 10:55:04 +0800
Tag:    v3.1.12

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

commit 878d69b7941c1f1cacd8fbae256c5a4413b750cf
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 28 Mar 2018 13:32:06 +0800
Tag:    v3.1.12

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