Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 14:03:10 +0000 (14:03 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:29 +0000 (09:07 +0000)

Trivial merge