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