Refactor #3985: Fix bug when margin not set in ccs.Margin
Merge pull request #1558 from pandamicro/develop

Refactor #3985: Fix bug when margin not set in ccs.Margin