Summary of changes: 8466e11... use original sources from here on out (*) 8045a82... Merge branch 'f17' (*) This commit already existed in another branch; no separate mail sent