Merge branch 'MDL-58431-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 03:01:39 +0000 (11:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 03:01:39 +0000 (11:01 +0800)

Trivial merge