Update dependencies

Conflicts:
	pom.xml
Merge pull request #1128 from emmanuel-keller/1.6

Update dependencies