Merge branch 'MDL-57290_master' of https://github.com/nadavkav/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 00:43:36 +0000 (08:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 00:43:36 +0000 (08:43 +0800)

Trivial merge