Git merges in Moodle 3.0.1 by AMOS bot

commit 63385ff2b5887c4a87a0a1ded0f03c1eedd630d8
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 20 Nov 2015 00:04:20 +0800
Tag:    v3.0.1

Merge branch 'MOODLE_30_STABLE' into install_30_STABLE