Sync'd branch releases/aurora with upstream @ Wed Nov  5 15:26:43 PST 2014