Merge branch 'MDL-50542-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 07:32:38 +0000 (07:32 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 07:32:38 +0000 (07:32 +0000)

Trivial merge