Merge branch 'MDL-46214-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 08:47:02 +0000 (09:47 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 08:47:02 +0000 (09:47 +0100)

Trivial merge