Merge branch 'master' of https://github.com/droglenc/FSA

Conflicts:
	NEWS.md
Merge branch 'master' of https://github.com/droglenc/FSA