Merge branch 'MDL-54702_master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 12:41:48 +0000 (13:41 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 12:41:48 +0000 (13:41 +0100)

Trivial merge