Dont use git protocol. Use SSH.
Dont use git protocol
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	os2web_esdh_provider.make
Merge branch 'develop'
Fix merge fault on make.
Merge branch 'develop' into release-1.0
Merge branch 'release-1.0'
Make aliases unique.

Some code sniffering.
Merge branch 'hotfix-1.0.1' into develop