Merge branch 'MDL-52595-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Dec 2015 11:29:01 +0000 (11:29 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Dec 2015 11:29:01 +0000 (11:29 +0000)

Trivial merge