[pkg-upd] 40.1-1

Merged Mark Wagie requested to merge 40.1 into master

Merged with Arch changes

Merge request reports