Git merges in Moodle 3.4.2 by Jun Pataleta

commit 6bbcb9c2e5676cf1cf183cc9a47831746a7582c4
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 16 Jan 2018 23:01:14 +0800
Tag:    v3.4.2

Merge branch 'MDL-61221-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE