v321 branch Changes

v321_preview2 to v321_base (2015-08-17 to 2015-08-24) v321