Merge branch 'MDL-58515-master' of https://github.com/lucisgit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 05:03:34 +0000 (13:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 05:03:34 +0000 (13:03 +0800)

Trivial merge