Merge branch 'MDL-54113-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 06:53:26 +0000 (07:53 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 06:53:26 +0000 (07:53 +0100)

Trivial merge