Git merges in Moodle 3.1.14 by David Monllao

commit 1b87b66946c90a6d757bc92ad401fe742e6ed331
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 04 Sep 2018 18:41:54 +0800
Tag:    v3.1.14

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