Summary of changes: 7b87ee1... Fix for bugs #1023598 and #986660 (*) 9d68e99... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent