Merge branch 'MDL-55771_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 09:18:53 +0000 (10:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 09:18:53 +0000 (10:18 +0100)

Trivial merge