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