fixed #755
Merge branch 'development' of https://github.com/siacs/Conversations into development