[cpanspec/el6: 14/14] Merge branch 'master' into el6