Sync'd branch releases/aurora with upstream @ Sun Nov  2 14:53:29 PST 2014