Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 06:35:41 +0000 (14:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 06:35:41 +0000 (14:35 +0800)

Trivial merge