SERVER_NAME should now be Optionnal (default to None)
Merge ../eve into develop