Git merges in Moodle 3.0.8 by AMOS bot

commit f2066cb88f36c0f9bb6942826f675cf461f55145
Author: AMOS bot <amos@moodle.org>
Date:   Thu, 01 Dec 2016 00:06:02 +0800
Tag:    v3.0.8

Merge branch 'MOODLE_30_STABLE' into install_30_STABLE


commit 8690bb80684db0d0e4549c035a5c85696660a735
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 26 Nov 2016 00:04:47 +0800
Tag:    v3.0.8

Merge branch 'MOODLE_30_STABLE' into install_30_STABLE