Merge branch 'MDL-53281-master' of git://github.com/merrill-oakland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 01:25:07 +0000 (09:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 01:25:07 +0000 (09:25 +0800)

Trivial merge