Merge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:57:52 +0000 (08:57 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 08:57:52 +0000 (08:57 +0000)

Trivial merge