Extend placeholders instead of classes
Merge pull request #3309 from guardian/fix-i-extend

Extend placeholders instead of classes