v316 branch Changes

v316_preview2 to v316_base (2015-05-04 to 2015-05-11) v316