Merge branch 'release/1.0'
Remove additional gatekeeper conditions
Merge branch 'hotfix/gatekeeper-request'
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	functions.php