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

Trivial merge