Merge branch 'MDL-58285' of https://github.com/NeillM/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 08:53:23 +0000 (08:53 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 08:53:23 +0000 (08:53 +0000)

Trivial merge