Merge branch 'MDL-56839-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:06:48 +0000 (13:06 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 13:06:48 +0000 (13:06 +0000)

Trivial merge