Upgraded to official Haystack 2.0 release.