Changed fix in #2099 to box-sizing Compass mixin.
Merge branch 'v3.0'