Merge pull request #366 from jdlehman/master

Enable box-sizing changes at the component level