Merge branch 'MDL-55292' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Aug 2016 07:25:45 +0000 (15:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Aug 2016 07:25:45 +0000 (15:25 +0800)

Trivial merge