Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 04:36:45 +0000 (12:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 04:36:45 +0000 (12:36 +0800)

Trivial merge