Build #621:   Merging master branch changes on branch master about 6 years ago