No need for the archiving branch, work not happening there anyway so merging to trunk