Merge branch 'MDL-56810_master' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 14:55:50 +0000 (14:55 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 14:55:50 +0000 (14:55 +0000)

Trivial merge