Merge branch 'MDL-50758' of https://github.com/creator23/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 13:08:39 +0000 (14:08 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 13:08:39 +0000 (14:08 +0100)

Trivial merge