Merge branch 'MDL-53811_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Apr 2016 21:01:38 +0000 (22:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Apr 2016 21:01:38 +0000 (22:01 +0100)

Trivial merge