v325 branch Changes

v325_preview2 to v325_base (2015-11-09 to 2015-11-16) v325