ZSDX 1.5.2 release.
Merge branch 'master' into v1.6

Conflicts:
	ChangeLog
Merge branch 'v1.6' of github.com:christopho/zsdx into v1.6