Merge branch 'MDL-57075-master' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 21:14:20 +0000 (21:14 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 21:14:20 +0000 (21:14 +0000)

Trivial merge