Merge branch 'MDL-57630-m' of https://github.com/micaherne/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Feb 2017 01:18:17 +0000 (09:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Feb 2017 01:18:17 +0000 (09:18 +0800)

Trivial merge