Fix warnings.
Merge branch 'dev' of github.com:overshare/overshare-kit into dev