Sync'd branch releases/release with upstream @ Wed Nov  5 17:06:52 PST 2014