Merge branch 'MDL-54559-int-master' of https://github.com/merrill-oakland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Jun 2016 00:23:25 +0000 (08:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:14 +0000 (09:04 +0100)

Trivial merge