Merge branch 'MDL-54593_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 May 2016 09:21:11 +0000 (10:21 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:09 +0000 (17:16 +0800)

Trivial merge