Merge branch 'master' into rhel6

Conflicts:
	pipework