Git merges in Moodle 2.7.11 by Andrew Nicols

commit c1e723b8e6c1ac6e9d9df4d8b6afda4d62e23089
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 16 Oct 2015 08:16:14 +0800
Tag:    v2.7.11

Merge branch 'MDL-50182_27' of git://github.com/stronk7/moodle into MOODLE_27_STABLE