v311 branch Changes

v311_preview2 to v311_base (2015-01-20 to 2015-01-26) v311