Merge branch 'MDL-51894-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 12:40:15 +0000 (12:40 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 12:40:15 +0000 (12:40 +0000)

Trivial merge