Merge branch 'MDL-48771-squashed' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Apr 2017 02:37:26 +0000 (10:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Apr 2017 02:37:26 +0000 (10:37 +0800)

Trivial merge