v285 branch Changes

v285_preview2 to v285_base (2013-06-11 to 2013-06-18) v285