FX-129
FX-141, FX-142, FX-143, FX-144
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ChangeLog
	version.sh