Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:20:34 +0000 (12:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:20:34 +0000 (12:20 +0000)

Trivial merge