Merge branch 'MDL-45762-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Jun 2016 01:54:49 +0000 (09:54 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:16 +0000 (09:04 +0100)

Trivial merge