Merge branch 'master' into buffer_size

Author: tleonhardt

cmd2.py

@@ -314,7 +314,7 @@ def new_func(instance, arg):
 # Can we access the clipboard?  Should always be true on Windows and Mac, but only sometimes on Linux
 # noinspection PyUnresolvedReferences
 try:
-    if six.PY3 and sys.platform.startswith('linux'):
+    if sys.platform.startswith('linux'):
         # Avoid extraneous output to stderr from xclip when clipboard is empty at cost of overwriting clipboard contents
         pyperclip.copy('')
     else: