Back to master on config

Signed-off-by: José Luis Di Biase <josx@interorganic.com.ar>