Summary of changes: dc83282... Merge branch 'master' into f14 (*) 8cdfc77... 1.0.6 (*) d07efbe... fix lib versioning (*) dd2ad70... fix merge (*) This commit already existed in another branch; no separate mail sent