Git merges in Moodle 3.4.7 by Andrew Nicols

commit 7b97be9f2535eed21f57c5420bb1ed3bac536197
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 08 Jan 2019 06:56:50 +0800
Tag:    v3.4.7

Merge branch 'MDL-63276_34' of https://github.com/stronk7/moodle into MOODLE_34_STABLE