Merge branch 'MDL-57300-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 09:32:53 +0000 (09:32 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:26 +0000 (13:01 +0800)

Trivial merge