Merge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:26:33 +0000 (12:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:26:33 +0000 (12:26 +0800)

Trivial merge