Merge branch 'MDL-56585-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 01:53:28 +0000 (09:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 01:53:28 +0000 (09:53 +0800)

Trivial merge