Merge branch 'MDL-57601-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:23:55 +0000 (12:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 12:23:55 +0000 (12:23 +0000)

Trivial merge