Merge branch 'MDL-56015-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Oct 2016 07:12:49 +0000 (15:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Oct 2016 07:12:49 +0000 (15:12 +0800)

Trivial merge