Merge branch 'MDL-53072_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 02:12:46 +0000 (10:12 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 02:12:46 +0000 (10:12 +0800)

Trivial merge