bz#1016134 verified
Merge branch 'sat6-fix' into sat-6.0.2