merge in 3.3 branch changes to tip
merge in 3.3 branch changes to tip

ekr/nss-old,nmav/nss,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,ekr/nss-old,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old