Merge branch 'MDL-52275_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Dec 2015 10:04:42 +0000 (10:04 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Dec 2015 10:04:42 +0000 (10:04 +0000)

Trivial merge