Merge branch 'MDL-54101_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 12 May 2016 13:04:55 +0000 (14:04 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 May 2016 10:11:29 +0000 (18:11 +0800)

Trivial merge