1.6 Shop objects and updates.
Merge branch '1.6'