Merge branch 'MDL-56133' of https://github.com/NeillM/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 06:23:50 +0000 (14:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Nov 2016 06:23:50 +0000 (14:23 +0800)

Trivial merge