Summary of changes: 9f88c86... Rebase to 1.6.15 and fix issue found in bz #871211 (*) 3498edf... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent