Fix formspec background padding when clipped
Merge remote-tracking branch 'upstream/master' into make