Merge branch 'MDL-49891-master-2' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 14:17:11 +0000 (15:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 14:17:11 +0000 (15:17 +0100)

Trivial merge