Another rollback.
Merge remote-tracking branch 'origin/master'
Run stop/start for app deploy rather than restart.
Hackish fix for an error going on in production.