Resolve conflict
Merge branch 'development' of github.com:planeta/quark into development
Revert "Merge branch 'development' of github.com:planeta/quark into development"

This reverts commit b7512d367e883e06e7d0933b1901817fc0454c74, reversing
changes made to dfd46f08690dacb3b451db8cb7648d655b2cfa38.