Merge pull request #13533 from wtgodbe/buildNumber