Summary of changes: 0fc5076... - Update to 0.3.6. (*) 3a76e18... Fix merge errors. (*) 3e394d4... Merge branch 'master' into f15 (*) 1dd9c0c... Update to 0.4.1. (*) (*) This commit already existed in another branch; no separate mail sent