Merge branch 'MDL-57967_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Sun, 19 Feb 2017 19:44:51 +0000 (19:44 +0000)
committerDan Poltawski <dan@moodle.com>
Sun, 19 Feb 2017 19:44:51 +0000 (19:44 +0000)

Trivial merge