I've uploaded 0.12.10-24 (for Diablo and Fremantle) which stores the margin and padding CSS values separately and adds them together to calculate the spacings.

The source code changes can be downloaded from here.

I'll look to push this to extras-testing at the end of the week, so please let me know if you find any issues before then.