handle merge
Merge branch 'new-push'

Conflicts:
	groovy/hotspots/extractDefects/extractDefects.groovy