Merge branch 'wip-mdl-57380' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 14 Dec 2016 01:55:34 +0000 (09:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 14 Dec 2016 01:55:34 +0000 (09:55 +0800)

Trivial merge