Test server restart
Merge pull request #1873 from cthiebault/bugs/server-restart

Test server restart