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