Sync'd branch releases/release with upstream @ Wed Nov  5 08:42:37 PST 2014