Merge branch 'MDL-21912-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 11:08:11 +0000 (11:08 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 11:08:11 +0000 (11:08 +0000)

Trivial merge