Don't register with keys
Merge remote-tracking branch 'origin/master' into deploy