Sync'd branch releases/aurora with upstream @ Wed Nov  5 18:04:41 PST 2014