fix mistakes in box-sizing fix which was merged from commit 82e2fe3160c12c4a363bc394194586d7f1e54900 / branch.
fix mistakes in box-sizing fix which was merged from commit 82e2fe3160c12c4a363bc394194586d7f1e54900 / branch.
Merge branch 'cthrax-master'

Conflicts:
	src/defaults.js