Merge branch 'MDL-51781_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 10:08:26 +0000 (11:08 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 10:08:26 +0000 (11:08 +0100)

Trivial merge