diff --git a/CHANGES.rst b/CHANGES.rst
index a7efe05..632014e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -740,19 +740,21 @@
 ------------------------
 New Features:
 
-- [#354] Make ListPortInfo hashable
 - [#411] Add a backend for Silicon Labs CP2110/4 HID-to-UART bridge. (depends on `hid` module)
 
 Improvements:
 
 - [#315] Use absolute import everywhere
 - [#351] win32: miniterm Working CMD.exe terminal using Windows 10 ANSI support
+- [#354] Make ListPortInfo hashable
 - [#372] threaded: "write" returns byte count
 - [#400] Add bytesize and stopbits argument parser to tcp_serial_redirect
 - [#408] loop: add out_waiting
 - [#500] Remove Python 3.2 and 3.3 from test
 - doc updates [#261, #296, #320, #333, #285, #356, #358, #342, #397, #389, #510]
- 
+- miniterm: add :kbd:`CTRL+T Q` as alternative to exit
+- miniterm: suspend function key changed to :kbd:`CTRL-T Z`
+
 Bugfixes:
 
 - [#371] Don't open port if self.port is not set while entering context manager
@@ -777,6 +779,7 @@
 - [#335] Add support to xr-usb-serial ports
 - [#494] posix: Don't catch the SerialException we just raised
 - [#519] posix: Fix custom baud rate to not temporarily set 38400 baud rates on linux
+- [#509 #518] list_ports: use hardcoded path to library on osx
 
 Bugfixes (win32):
 
diff --git a/LICENSE.txt b/LICENSE.txt
index 22a93d0..8920d4e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2001-2016 Chris Liechti <cliechti@gmx.net>
+Copyright (c) 2001-2020 Chris Liechti <cliechti@gmx.net>
 All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.rst b/README.rst
index ab3ce6f..2e793ca 100644
--- a/README.rst
+++ b/README.rst
@@ -12,7 +12,7 @@
 - Project Homepage: https://github.com/pyserial/pyserial
 - Download Page: https://pypi.python.org/pypi/pyserial
 
-BSD license, (C) 2001-2017 Chris Liechti <cliechti@gmx.net>
+BSD license, (C) 2001-2020 Chris Liechti <cliechti@gmx.net>
 
 
 Documentation
diff --git a/documentation/appendix.rst b/documentation/appendix.rst
index 57e8e2f..198a03d 100644
--- a/documentation/appendix.rst
+++ b/documentation/appendix.rst
@@ -109,7 +109,7 @@
 
 License
 =======
-Copyright (c) 2001-2017 Chris Liechti <cliechti@gmx.net>
+Copyright (c) 2001-2020 Chris Liechti <cliechti@gmx.net>
 All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/documentation/conf.py b/documentation/conf.py
index df9d14e..d878ea4 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -38,7 +38,7 @@
 
 # General information about the project.
 project = u'pySerial'
-copyright = u'2001-2017, Chris Liechti'
+copyright = u'2001-2020, Chris Liechti'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/documentation/pyserial.rst b/documentation/pyserial.rst
index 8a1afa8..080066f 100644
--- a/documentation/pyserial.rst
+++ b/documentation/pyserial.rst
@@ -13,7 +13,7 @@
 It is released under a free software license, see LICENSE_ for more
 details.
 
-Copyright (C) 2001-2016 Chris Liechti <cliechti(at)gmx.net>
+Copyright (C) 2001-2020 Chris Liechti <cliechti(at)gmx.net>
 
 Other pages (online)
 
diff --git a/documentation/tools.rst b/documentation/tools.rst
index 898c2d7..9685718 100644
--- a/documentation/tools.rst
+++ b/documentation/tools.rst
@@ -287,4 +287,5 @@
     Apply encoding on serial port, convert to Unicode for console.
     Added new filters, default to stripping terminal control sequences.
     Added ``--ask`` option.
-
+.. versionchanged:: 3.5
+    Enable escape code handling on Windows 10 console.
diff --git a/examples/tcp_serial_redirect.py b/examples/tcp_serial_redirect.py
index ae7fe2d..bd7db77 100755
--- a/examples/tcp_serial_redirect.py
+++ b/examples/tcp_serial_redirect.py
@@ -2,7 +2,7 @@
 #
 # Redirect data from a TCP/IP connection to a serial port and vice versa.
 #
-# (C) 2002-2016 Chris Liechti <cliechti@gmx.net>
+# (C) 2002-2020 Chris Liechti <cliechti@gmx.net>
 #
 # SPDX-License-Identifier:    BSD-3-Clause
 
diff --git a/examples/wxTerminal.py b/examples/wxTerminal.py
index 08c9ee9..64768a9 100755
--- a/examples/wxTerminal.py
+++ b/examples/wxTerminal.py
@@ -2,7 +2,7 @@
 #
 # A simple terminal application with wxPython.
 #
-# (C) 2001-2015 Chris Liechti <cliechti@gmx.net>
+# (C) 2001-2020 Chris Liechti <cliechti@gmx.net>
 #
 # SPDX-License-Identifier:    BSD-3-Clause
 
diff --git a/serial/__init__.py b/serial/__init__.py
index afd63a6..6160c8b 100644
--- a/serial/__init__.py
+++ b/serial/__init__.py
@@ -3,7 +3,7 @@
 # This is a wrapper module for different platform implementations
 #
 # This file is part of pySerial. https://github.com/pyserial/pyserial
-# (C) 2001-2017 Chris Liechti <cliechti@gmx.net>
+# (C) 2001-2020 Chris Liechti <cliechti@gmx.net>
 #
 # SPDX-License-Identifier:    BSD-3-Clause
 
diff --git a/serial/serialposix.py b/serial/serialposix.py
index 2f125c3..51e6a10 100644
--- a/serial/serialposix.py
+++ b/serial/serialposix.py
@@ -3,7 +3,7 @@
 # backend for serial IO for POSIX compatible systems, like Linux, OSX
 #
 # This file is part of pySerial. https://github.com/pyserial/pyserial
-# (C) 2001-2016 Chris Liechti <cliechti@gmx.net>
+# (C) 2001-2020 Chris Liechti <cliechti@gmx.net>
 #
 # SPDX-License-Identifier:    BSD-3-Clause
 #
diff --git a/serial/serialutil.py b/serial/serialutil.py
index 8c5ccfe..789219e 100644
--- a/serial/serialutil.py
+++ b/serial/serialutil.py
@@ -3,7 +3,7 @@
 # Base class and support functions used by various backends.
 #
 # This file is part of pySerial. https://github.com/pyserial/pyserial
-# (C) 2001-2016 Chris Liechti <cliechti@gmx.net>
+# (C) 2001-2020 Chris Liechti <cliechti@gmx.net>
 #
 # SPDX-License-Identifier:    BSD-3-Clause
 
diff --git a/serial/serialwin32.py b/serial/serialwin32.py
index 649a75f..e7da929 100644
--- a/serial/serialwin32.py
+++ b/serial/serialwin32.py
@@ -2,7 +2,7 @@
 #
 # backend for Windows ("win32" incl. 32/64 bit support)
 #
-# (C) 2001-2015 Chris Liechti <cliechti@gmx.net>
+# (C) 2001-2020 Chris Liechti <cliechti@gmx.net>
 #
 # This file is part of pySerial. https://github.com/pyserial/pyserial
 # SPDX-License-Identifier:    BSD-3-Clause
diff --git a/serial/tools/list_ports_osx.py b/serial/tools/list_ports_osx.py
index 0c719db..0b73fa2 100644
--- a/serial/tools/list_ports_osx.py
+++ b/serial/tools/list_ports_osx.py
@@ -7,7 +7,7 @@
 # and modifications by cliechti, hoihu, hardkrash
 #
 # This file is part of pySerial. https://github.com/pyserial/pyserial
-# (C) 2013-2015
+# (C) 2013-2020
 #
 # SPDX-License-Identifier:    BSD-3-Clause
 
diff --git a/serial/urlhandler/protocol_loop.py b/serial/urlhandler/protocol_loop.py
index 8ac8ddf..2aeebfc 100644
--- a/serial/urlhandler/protocol_loop.py
+++ b/serial/urlhandler/protocol_loop.py
@@ -6,7 +6,7 @@
 # and it was so easy to implement ;-)
 #
 # This file is part of pySerial. https://github.com/pyserial/pyserial
-# (C) 2001-2015 Chris Liechti <cliechti@gmx.net>
+# (C) 2001-2020 Chris Liechti <cliechti@gmx.net>
 #
 # SPDX-License-Identifier:    BSD-3-Clause
 #
diff --git a/setup.py b/setup.py
index ea53643..9b5b73b 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 # For Python 3.x use the corresponding Python executable,
 # e.g. "python3 setup.py ..."
 #
-# (C) 2001-2017 Chris Liechti <cliechti@gmx.net>
+# (C) 2001-2020 Chris Liechti <cliechti@gmx.net>
 #
 # SPDX-License-Identifier:    BSD-3-Clause
 import io