Updated dependencies
Merge branch '1-3-stable'

Conflicts:
	Versionfile