Merge branch 'MDL-57429-master-fix' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Mar 2017 03:51:50 +0000 (11:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Mar 2017 03:51:50 +0000 (11:51 +0800)

Trivial merge