Update to r42885:
This patch addresses blackend's comment on desktop environments and bjk's comment on client/server confusion.