[faad2/el6: 14/14] Merge branch 'el7' into el6