Merge

Conflicts:
	js/weechat-protocol.js