v1.5.1 solving packaging issues only
Merge branch '1.5.1'

Conflicts:
	CHANGES