Merge branch 'MDL-57213-master-2' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Dec 2016 05:06:18 +0000 (13:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Dec 2016 05:06:18 +0000 (13:06 +0800)

Trivial merge