[faad2/el6] (14 commits) ...Merge branch 'el7' into el6