Keep the options of server.inject untouched #2000
Remove timer from a bad copy/paste
Merge pull request #2001 from fampinheiro/master

Keep the options of server.inject untouched #2000