Sync'd branch releases/release with upstream @ Thu Nov  6 11:02:49 PST 2014