Poll ellis
Merge pull request #50 from Metaswitch/poll-ellis

[Reviewer: Mike] Poll ellis