Apply PR from @mowens.
Merge branch 'master' of github.com:typhoon-framework/Typhoon