Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 10:20:08 +0000 (10:20 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 10:20:08 +0000 (10:20 +0000)

Trivial merge