Merge branch 'MDL-55956-master-integration' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 10 Mar 2017 04:18:20 +0000 (12:18 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:04:49 +0000 (18:04 +0000)

Trivial merge