terryh 08/08/2014

more merges