Prepare switch to mozilla90

Edited by Georg Koppen