Updates for Eagle beta 42 from upstream.