Merge branch 'MDL-56693_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Nov 2016 14:25:20 +0000 (14:25 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Nov 2016 14:25:20 +0000 (14:25 +0000)

Trivial merge