Merge branch 'MDL-57429-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Mar 2017 00:16:07 +0000 (08:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Mar 2017 00:16:07 +0000 (08:16 +0800)

Trivial merge