Merge branch 'MDL-55742-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 09:50:47 +0000 (10:50 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 09:50:47 +0000 (10:50 +0100)

Trivial merge