Merge remote-tracking branch 'origin/deploy' into deploy.gibson