Alexey: fix
Merge branch 'develop' of github.com:Starcounter/Starcounter into develop