Merge branch 'rertzinger/generic-load-save' into weechat