Merge branch 'MDL-51991-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 01:18:52 +0000 (09:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 01:18:52 +0000 (09:18 +0800)

Trivial merge