Merge branch 'MDL-55027_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 09:56:11 +0000 (10:56 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:56 +0000 (09:24 +0100)

Trivial merge