Summary of changes: 6ee40fd... Update to latest upstream release. (*) db8b98c... Revert "Updated to 1.2.1, copy license files" 1cbf69a... Merge branch 'master' into f16 185fd71... Added license files (*) This commit already existed in another branch; no separate mail sent