Merge branch 'MDL-56959-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Nov 2016 07:53:31 +0000 (07:53 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Nov 2016 07:53:31 +0000 (07:53 +0000)

Trivial merge