Updated to reflect new dev60 branch

Ongoing development will take place on this branch