Bump gatekeeper
Merge branch 'master' into gsa

Conflicts:
	gatekeeper