Merge from genscripts r447: brian.dolbec