Support the full four-point version string
Merge branch '1905-prep-for-full-version-string' into rails-3-develop