Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:28:32 +0000 (09:28 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:28:32 +0000 (09:28 +0000)

Trivial merge