Merge branch 'MDL-55528-master-fix' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Mar 2017 06:31:49 +0000 (14:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Mar 2017 06:31:49 +0000 (14:31 +0800)

Trivial merge