Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 May 2017 03:48:40 +0000 (11:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 May 2017 03:48:40 +0000 (11:48 +0800)

Trivial merge