Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 08:17:53 +0000 (09:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 08:17:53 +0000 (09:17 +0100)

Trivial merge