Merge branch 'MDL-54610_master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 01:23:48 +0000 (09:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:58 +0000 (09:24 +0100)

Trivial merge