Sync'd branch releases/aurora with upstream @ Tue Nov  4 07:44:32 PST 2014