Merge branch 'MDL-30811-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 05:43:53 +0000 (13:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 05:43:53 +0000 (13:43 +0800)

Trivial merge