Sync'd branch releases/aurora with upstream @ Fri Nov  7 20:18:42 PST 2014