Merge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 12:48:09 +0000 (12:48 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 12:48:09 +0000 (12:48 +0000)

Trivial merge