Merge branch 'MDL-54841-master' of https://github.com/nashtechdev01/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jul 2016 10:06:38 +0000 (11:06 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jul 2016 10:06:38 +0000 (11:06 +0100)

Trivial merge