Merge branch 'MDL-56943-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 02:54:09 +0000 (10:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 02:54:09 +0000 (10:54 +0800)

Trivial merge