Git merges in Moodle 3.0.8 by David Monllao

commit fb92dba76fd33e2cb7ab68dd9c8dd161032f96a4
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 29 Nov 2016 11:43:31 +0800
Tag:    v3.0.8

Merge branch 'MDL-57163-30' of https://github.com/vvzh/moodle into MOODLE_30_STABLE