Merge branch 'MDL-55191_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 03:41:03 +0000 (11:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 03:41:03 +0000 (11:41 +0800)

Trivial merge