Merge branch 'MDL-56467_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 Nov 2016 10:15:51 +0000 (10:15 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 17 Nov 2016 10:15:51 +0000 (10:15 +0000)

Trivial merge