.
Merge branch '5.1-TRUNK' of https://github.com/wmarinho/docker-pentaho into 5.1-TRUNK

Conflicts:
	data-integration/Dockerfile