Moved bugfix up to next release