Merge remote-tracking branch 'gvalkov/master' into cleanupOldBranches

Conflicts:
	jenkins_autojobs/main.py