Merge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Dec 2016 02:49:34 +0000 (10:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Dec 2016 02:49:34 +0000 (10:49 +0800)

Trivial merge