Merge branch 'wip-mdl-45821' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 04:51:59 +0000 (12:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 04:51:59 +0000 (12:51 +0800)

Trivial merge