Merge branch 'MDL-57206-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 04:21:25 +0000 (12:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 04:21:25 +0000 (12:21 +0800)

Trivial merge