Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jun 2016 00:15:23 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jun 2016 00:15:23 +0000 (08:15 +0800)

Trivial merge