cleaning (and py3 branch compat) around clipboard
merge branch next into py3