Test for `+X11` before using clipboard=unnamedplus
Fix test for 'unnamedplus' again...
Merge branch 'pr/565' into 3.0

Fixes #564, #565
Merge remote-tracking branch 'upstream/3.0' into eda-1.0