Merge branch 'MDL-54632-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 07:17:03 +0000 (15:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 07:17:03 +0000 (15:17 +0800)

Trivial merge