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

Trivial merge