v315 branch Changes

v315_preview2 to v315_base (2015-04-13 to 2015-04-20) v315