Build #3395:   Merge branch '1.0' on branch master about 5 years ago