Git merges in Moodle 3.2.7 by David Monllao

commit 4a0dfea83f165d252c6a5e89030bae5ab09f1e76
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 08 Jan 2018 21:59:19 +0800
Tag:    v3.2.7

Merge branch 'MDL-61169-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE