Merge branch 'MDL-49021_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 17:02:24 +0000 (17:02 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 17:02:24 +0000 (17:02 +0000)

Trivial merge