Only use strokeWidth in object scaling when stroke is set.

Also only use half of the strokeWidth, this matters especially when the strokeWidth is large compared to the object size.
Merge branch 'master' into scaling-strokewidth-fix
Merge pull request #1644 from ChrisBuergi/scaling-strokewidth-fix

Scaling strokewidth fix