Sync'd branch releases/aurora with upstream @ Mon Nov  3 00:58:44 PST 2014