Changes since tag 90001-1

commit 7ee9fcdbd76f2714cc093c3523edf7054d8c43f9
Author: phyber <phyber@wowace>
Date:   Tue Oct 20 08:52:45 2020 +0100

    Add fixes for Classic

