Merge branch 'master_MDL-51916' of https://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 13:17:54 +0000 (13:17 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 13:17:54 +0000 (13:17 +0000)

Trivial merge