Merge branch 'MDL-57169_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 Nov 2016 11:04:38 +0000 (11:04 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Nov 2016 11:04:38 +0000 (11:04 +0000)

Trivial merge