Fix eap->hoikas self-patch
Fix External Client garbage-strings
Fix DTProgress colors trashed by merge.
Merge remote-tracking branch 'huru/master'