Merge branch 'MDL-55355-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 02:45:15 +0000 (10:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 02:45:15 +0000 (10:45 +0800)

Trivial merge