Merge branch 'master' of git.in.moodle.com:moodle/integration; branch 'MDL-35980...
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Feb 2017 02:33:40 +0000 (10:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Feb 2017 02:33:40 +0000 (10:33 +0800)

Trivial merge