Sync'd branch releases/release with upstream @ Mon Nov  3 00:15:38 PST 2014