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