Merge branch 'mdl-56831-master' of https://github.com/Dagefoerde/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:21:35 +0000 (13:21 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:21:35 +0000 (13:21 +0000)

Trivial merge