sync to 29Nov13; many changes