Sync'd branch releases/aurora with upstream @ Fri Nov  7 09:00:02 PST 2014