Merge branch 'MDL-57613-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 16:17:09 +0000 (16:17 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 16:17:09 +0000 (16:17 +0000)

Trivial merge