Merge branch 'wip-mdl-57112' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 24 Nov 2016 00:43:45 +0000 (08:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 24 Nov 2016 00:43:45 +0000 (08:43 +0800)

Trivial merge