Merge branch 'MDL-56072-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 28 Sep 2016 00:37:48 +0000 (08:37 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 28 Sep 2016 00:37:48 +0000 (08:37 +0800)

Trivial merge