avoid putting an unexpected 'version' attribute in configuration hash
Merge branch 'feature/server_configuration' into develop