Merge branch 'MDL-51861' of https://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 6 Nov 2015 10:04:02 +0000 (10:04 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 6 Nov 2015 10:04:02 +0000 (10:04 +0000)

Trivial merge