Merged ClundXIII/NavEditor master