Merge branch 'MDL-54948-master-fix2' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Jun 2016 02:50:14 +0000 (10:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Jun 2016 02:50:14 +0000 (10:50 +0800)

Trivial merge