Update from azov
Update from azov
Merge branch 'master' of ssh://github.com/lgaultier/abstract