Summary of changes: 9839aa6... - Resolves bz 678243 - Resolves bz 680051 - Resolves bz 678 (*) 05c30d6... Merge branch 'master' into el5 (*) This commit already existed in another branch; no separate mail sent