Don't mix component formats
Merge pull request #470 from freddietilley/master

Don't mix component formats