Git merges in Moodle 3.3.5 by Jun Pataleta

commit 5abcd6485278f228b9dfaed11b3a857ad07c2091
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 16 Jan 2018 23:01:29 +0800
Tag:    v3.3.5

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