Git merges in Moodle 3.1.11 by Andrew Nicols

commit 6fb9c392568e79cb7b764d460747c60ff9bf8850
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Feb 2018 17:55:08 +0800
Tag:    v3.1.11

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


commit 5e99464c96a3a63d07231d77e5e1ee53b6ec91f8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Jan 2018 11:02:28 +0800
Tag:    v3.1.11

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