Merge branch 'weechat' into devel