Merge branch 'wip-MDL-49189-master' of https://github.com/kwiliarty/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 14:02:58 +0000 (15:02 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 14:02:58 +0000 (15:02 +0100)

Trivial merge