Merge branch 'MDL-50539-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:15:59 +0000 (09:15 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:15:59 +0000 (09:15 +0000)

Trivial merge