Merge branch 'MDL-50970-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Apr 2017 07:38:53 +0000 (15:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Apr 2017 07:38:53 +0000 (15:38 +0800)

Trivial merge