Re: Handling bugs which are fixed in upstream, but not released yet