Merge branch 'wip-MDL-51834-master' of https://github.com/kwiliarty/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 13:54:41 +0000 (13:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 13:54:41 +0000 (13:54 +0000)

Trivial merge