Merge branch 'MDL-58220-master-fix4' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 03:54:58 +0000 (11:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 03:54:58 +0000 (11:54 +0800)

Trivial merge