Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Mar 2017 04:02:17 +0000 (12:02 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:04:44 +0000 (18:04 +0000)

Trivial merge