Change to official patch for 1.8.2
Fix clobber of property and list item sorting