[weechat/f17: 2/2] Merge branch 'master' into f17