v304 branch Changes

v304_preview2 to v304_base (2014-08-04 to 2014-08-11) v304