Merge double assignment + eliminate trail space.

Merged username-removed-945785 requested to merge shlomif/inkscape:refactoring into master