* merge in matts r6917 so it doesn't colide with ongoing changes.