Merge branch 'MDL-57660-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Feb 2017 13:46:50 +0000 (13:46 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Feb 2017 13:46:50 +0000 (13:46 +0000)

Trivial merge