Git merges in Moodle 3.1.12 by Jun Pataleta

commit 85e9ee2175c6ca66f8f5472594d548c5d20760d2
Author: Jun Pataleta <jun@moodle.com>
Date:   Wed, 09 May 2018 12:00:57 +0800
Tag:    v3.1.12

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


commit 36a7b9f2340c007deaa1ef63639294a189b9d7d8
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 29 Mar 2018 12:55:43 +0800
Tag:    v3.1.12

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