Merge branch 'MDL-52486-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 11:19:55 +0000 (11:19 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 11:19:55 +0000 (11:19 +0000)

Trivial merge