Merge branch 'MDL-56913' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:58:47 +0000 (13:58 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:58:47 +0000 (13:58 +0000)

Trivial merge