Correctly merge attributes without leading whitespace
Merge pull request #1455 from aadsm/fix-attributes-merge

Correctly merge attributes without leading whitespace