Sync'd branch releases/aurora with upstream @ Mon Nov  3 08:16:56 PST 2014