Sync tickets between 1004 and trunk

Bad developer. you should be working out of the 1004 branch and merging into trunk. fix this practice please.