Summary of changes: 90b14d0... do not store history in /tmp (#990197) (*) 298d681... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent