Updated version string
Fixed version string
Merge remote-tracking branch 'devel/fix_version' into release
Merge remote-tracking branch 'origin/release'