Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 11:28:13 +0000 (11:28 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 11:28:13 +0000 (11:28 +0000)

Trivial merge