Merge branch 'MDL-58085-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 13 Apr 2017 14:33:43 +0000 (15:33 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Apr 2017 14:33:43 +0000 (15:33 +0100)

Trivial merge