Polymorphism ftw
Merge pull request #3083 from alexspeller/polymorphism-ftw

Polymorphism ftw