Dnewman merge

Merge in recent work from SVN repo