Sync'd branch releases/aurora with upstream @ Wed Nov  5 09:31:39 PST 2014