Fix a build failure.
Merge branch 'master' into SwiftTest