Summary of changes: 4e96af8... new upstream release (*) abd48f9... new upstream release (*) 75c070e... New 98 release (*) 91ddecd... fix merge issues (*) This commit already existed in another branch; no separate mail sent