Merge branch 'MDL-56673-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Nov 2016 04:07:18 +0000 (12:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Nov 2016 04:07:18 +0000 (12:07 +0800)

Trivial merge