Merge branch 'master' of https://github.com/servicio/industrial.git