Increase padding on generalbox class to a sensible value
Merge branch 'master_BFC' into master_24
Remove whitespace at end of core.css introduced by merge