Merge branch 'MDL-53208' of https://github.com/mr-russ/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 02:29:09 +0000 (10:29 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 02:29:09 +0000 (10:29 +0800)

Trivial merge