Merge request from changes in latest patch (#22). Note the changes proposed address margin as well, which isn't mentioned in the IS but since it includes the same selector, it makes sense to fix.