Merge branch 'MDL-54049-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 May 2016 02:34:34 +0000 (10:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 May 2016 02:34:34 +0000 (10:34 +0800)

Trivial merge