imported updated Annex60 base classes...

 based on commit bd523e5a73bee2452eeb95697e6eb2cb06afe9ad
no merge conflicts