Merge branch 'MDL-56784-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Nov 2016 05:49:51 +0000 (13:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Nov 2016 05:49:51 +0000 (13:49 +0800)

Trivial merge