Keep attribute order during import
Merge pull request #1279 from erwinwinder/master

Keep attribute order during import