Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 13:20:35 +0000 (13:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 13:20:35 +0000 (13:20 +0000)

Trivial merge