v317 branch Changes

v317_preview2 to v317_base (2015-05-25 to 2015-06-01) v317