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