The merge was mostly straightforward. I ran
git log --oneline $(git merge-base master modularize)..master
to see all changes applied to master while this topic branch was being
worked in order to ensure they weren't accidentally missed:

83bee365 SVN_SILENT made messages (.desktop file)
f2299f1f xsession: Disable session driver installation by default.
05f87453 Remove undefined method for default module handling.

2 were merged correctly, the session driver default had to be
re-committed to the appropriate module.

Conflicts:
	kdesrc-build