Summary of changes: 55b959d... Merge branch 'master' into el6 (*) 0d90890... Rebased on Proton 0.7 (*) f36f8d8... Merge branch 'master' into f20 (*) (*) This commit already existed in another branch; no separate mail sent