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

Trivial merge