Merge branch 'MDL-55324-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Nov 2016 04:09:46 +0000 (12:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Nov 2016 04:09:46 +0000 (12:09 +0800)

Trivial merge