Merge branch 'MDL-53919_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 27 Apr 2016 09:07:03 +0000 (10:07 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:17:49 +0000 (12:17 +0100)

Trivial merge