Changes since tag v6

commit 1b8b43a8cc844298cd644ff9063bc6b457ad8c63
Author: David Lynch <kemayo@gmail.com>
Date:   Sat Sep 14 20:00:56 2019 -0500

    Fix for 80200

