Merge branch 'MDL-56596-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Nov 2016 13:43:54 +0000 (13:43 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Nov 2016 13:43:54 +0000 (13:43 +0000)

Trivial merge