Merge branch 'master' into JENKINS-21010

Conflicts:
	src/main/webapp/pipe.js