Sync'd branch releases/release with upstream @ Thu Nov  6 07:12:35 PST 2014