Merge branch 'MDL-17955-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 08:01:46 +0000 (09:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 08:01:46 +0000 (09:01 +0100)

Trivial merge