Merge branch 'MDL-53964' of https://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 16:07:28 +0000 (16:07 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 16:07:28 +0000 (16:07 +0000)

Trivial merge