Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 13:56:22 +0000 (13:56 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Nov 2016 13:56:22 +0000 (13:56 +0000)

Trivial merge