FX-107, FX-129, FX-130, FX-131
Fixed endif termination error
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ChangeLog
	version.sh