Merge branch 'MDL-48856' of https://github.com/mr-russ/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Aug 2016 13:45:06 +0000 (14:45 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Aug 2016 13:45:06 +0000 (14:45 +0100)

Trivial merge