Merge branch 'MDL-56792-master-v2' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 03:27:57 +0000 (11:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 03:27:57 +0000 (11:27 +0800)

Trivial merge