Merge "Update version string." into eclair