Merging Scott's hotfix for the body margin bug