Summary of changes: 0f96cea... Update from latest testing, still pending on issue before n (*) 393184c... Merge branch 'f20' (*) This commit already existed in another branch; no separate mail sent