Reinstated block alpha to flavoursoft. Thanks to A Pukhov
Merge branch 'master' into officialTag
Fixed officialTag Makefile.am