merge from mozilla/nightlytt