[Update] Typhoon (1.6.1)
Merge pull request #5889 from rhgills/master

[Update] Typhoon (1.6.1)