Closes socd-io/Deployment#231
Closes socd-io/Deployment#230