Merge branch 'MDL-59369-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Jul 2017 01:47:26 +0000 (09:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Jul 2017 01:47:26 +0000 (09:47 +0800)

Trivial merge