Fixes issue U4-2757 where generic properties are not ordered correctly.
Merge pull request #223 from Attackmonkey/Hackathon-2757

Fixes issue U4-2757 where generic properties are not ordered correctly.