[z-push: 6/7] Merge branch 'el6'