v318 branch Changes

v318_preview2 to v318_base (2015-06-15 to 2015-06-22) v318