Updates for Eagle beta 46 from upstream.