Commit bdc99f66 authored Sep 17, 2018 by Pedro Eduardo Trujillo

Merge branch 'master' into 'dev'

# Conflicts:
#   docker-compose.tmpl.yml

There are no changes