Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 08:00:06 +0000 (16:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 08:00:06 +0000 (16:00 +0800)

Trivial merge