Merge branch 'MDL-59726-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 06:28:23 +0000 (14:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 06:28:23 +0000 (14:28 +0800)

Trivial merge