Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jan 2017 18:07:12 +0000 (18:07 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Jan 2017 11:33:58 +0000 (11:33 +0000)

Trivial merge