Git merges in Moodle 3.1.10 by Eloy Lafuente (stronk7)

commit dc7420d411fc0fc4be2d8340f9ea480c5afc4675
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Sat, 13 Jan 2018 03:35:27 +0800
Tag:    v3.1.10

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


commit 6ac052dbc454dc6a3b018d89e7fdd07b05b94994
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Dec 2017 21:47:34 +0800
Tag:    v3.1.10

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