Sync'd branch releases/aurora with upstream @ Wed Nov  5 14:25:29 PST 2014