Merge branch 'MDL-55049-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 06:16:54 +0000 (14:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 06:16:54 +0000 (14:16 +0800)

Trivial merge