Merge branch 'MDL-35978-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:54:13 +0000 (09:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 09:54:13 +0000 (09:54 +0000)

Trivial merge