Merge branch 'MDL-51411' of https://github.com/andrewhancox/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Dec 2015 09:05:45 +0000 (09:05 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Dec 2015 09:05:45 +0000 (09:05 +0000)

Trivial merge