Merge branch 'MDL-47162' of https://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 12:13:19 +0000 (12:13 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 12:13:19 +0000 (12:13 +0000)

Trivial merge