Merge branch 'wip-mdl-54628' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 11:35:39 +0000 (11:35 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:26 +0000 (13:01 +0800)

Trivial merge