Merge branch 'MDL-54964-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jun 2016 00:44:50 +0000 (08:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 07:05:15 +0000 (15:05 +0800)

Trivial merge