Sync'd branch releases/aurora with upstream @ Thu Nov  6 07:25:09 PST 2014