[tarsnap: 3/5] Merge branch 'el6' into el7