Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 11:27:20 +0000 (11:27 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 11:27:20 +0000 (11:27 +0000)

Trivial merge