Sync'd branch releases/aurora with upstream @ Wed Nov  5 08:38:34 PST 2014