Ahasuerus - 2019-05-20

Attaching changes submittedb by Dirk Stocker.