Merge branch 'master' into make_it_mojo
This does nothing more than startup and immediately fail with a
"kdesrc-build -p" at this point, but this hasn't ended up as broken as
I'd been afraid it would by now.
Conflicts:
modules/ksb/Application.pm
t/read-module-options.t
t/smoke/bug-394497-ignore-dep-module.t
vim/syntax/kdesrc-buildrc.vim