Merge to quassel master/