Git merges in Moodle 3.1.14 by Jake Dallimore

commit a27fbd640d0c62d12dbb6a8fe6d26e503445bc08
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 28 Aug 2018 16:56:51 +0800
Tag:    v3.1.14

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