Harbour (upstream) + Fixes and additions = Version 3.4