Git merges in Moodle 3.1.14 by Jun Pataleta

commit de284c4cd4fbabbbc8970ff785c9cf8ba2781fb9
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 07 Sep 2018 11:10:23 +0800
Tag:    v3.1.14

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


commit a9ec123f5250e62f7cc5654c6169114be35bb376
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 04 Sep 2018 10:18:08 +0800
Tag:    v3.1.14

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