Sync'd branch releases/aurora with upstream @ Fri Nov  7 07:04:50 PST 2014