6.1 display object updates
Merge pull request #1046 from stevewithington/develop

6.1 display object updates