Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 07:49:49 +0000 (15:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 07:49:49 +0000 (15:49 +0800)

Trivial merge