Git merges in Moodle 3.0.1 by Andrew Nicols

commit 7d05696b12265a58ed807748a280d8d0335540a0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 02 Dec 2015 11:45:21 +0800
Tag:    v3.0.1

Merge branch 'wip-mdl-52357-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE