Summary of changes: 1e952f5... use the right conditional (too much beer) (*) dfacbdd... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent