Merge remote-tracking branch 'origin/master' into make_it_mojo

This required touching up some changes that involve the long-removed IPC
handling stuff.

Conflicts:
	modules/ksb/Updater/Git.pm
	vim/syntax/kdesrc-buildrc.vim