v305 branch Changes

v305_preview2 to v305_base (2014-08-25 to 2014-09-02) v305