merge master again (2.0-10 changelog only)
[sfa.git] / sfa / __init__.py