Merge branch 'MDL-51737-master-3' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 22 Oct 2015 13:43:20 +0000 (14:43 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 22 Oct 2015 13:43:20 +0000 (14:43 +0100)

Trivial merge