Git merges in Moodle 2.6.9 by Andrew Nicols

commit 8b16c884e7ab64ce1008957bcfd1454e53f6c839
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 04 Mar 2015 08:54:01 +0800
Tag:    v2.6.9

Merge branch 'MDL-49364_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE