Implements #1298
Work on #1298
Update dependencies

Conflicts:
	pom.xml
Fixes #1300
Implements #1241
Merge pull request #1303 from emmanuel-keller/1.6

Bug fixes and improvements