Merge branch 'MDL-54782_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 16:23:33 +0000 (16:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 16:23:33 +0000 (16:23 +0000)

Trivial merge