Merge remote-tracking branch 'origin/f12' into rhel6