On the fsx-1.10 branch:
Catch-up with /trunk up to and including r1687421.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/fsx-1.10@1687422 13f79535-47bb-0310-9956-ffa450edef68