Merge branch 'MDL-53366-master' of github.com:ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 06:15:49 +0000 (14:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 06:15:49 +0000 (14:15 +0800)

Trivial merge