terryh 07/18/2014

more merges