- Merge changes to version.sh from master